Merged
Conversation
Author
2025-02-10.19-29-29.mp4rock preview |
formlessnameless
approved these changes
Feb 11, 2025
Collaborator
formlessnameless
left a comment
formlessnameless
left a comment
There was a problem hiding this comment.
finally. rock tech
3 tasks
sleepyyapril
pushed a commit
to TheDenSS14/TheDen
that referenced
this pull request
Jul 1, 2025
<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> ## About the PR <!-- What did you change? --> This PR ports several plushies from Impstation. I attempted to keep this as close to the Impstation implementation as possible, so only the ragdoll and sentimental doll were added as loadout options. partial ports of. christ alive. impstation/imp-station-14#86 (ursa minor plushie) impstation/imp-station-14#1580 (ursa massive plushie) impstation/imp-station-14#1641 (ronck soundcollection) impstation/imp-station-14#1747 (dolls & dwarf? plushie) impstation/imp-station-14#2277 (griffy plushie) ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> gift exchange with impstation/imp-station-14#2879 :) ## Technical details <!-- Summary of code changes for easier review. --> - 2 flavor profiles (whimsy and stardust) - 7 plushies, added to the prize counter - 2 loadout prototypes - 1 soundcollection i don't know why it was made like this ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->   ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 hivehum, atdoop, starlighthowls, widgetbeck - add: A few new plushies can be bought from the prize counter. --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>
makyo
pushed a commit
to makyo/substations
that referenced
this pull request
Jul 9, 2025
Remove secret Fix up plushies, add to crate <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> ## About the PR <!-- What did you change? --> This PR ports several plushies from Impstation. I attempted to keep this as close to the Impstation implementation as possible, so only the ragdoll and sentimental doll were added as loadout options. partial ports of. christ alive. impstation/imp-station-14#86 (ursa minor plushie) impstation/imp-station-14#1580 (ursa massive plushie) impstation/imp-station-14#1641 (ronck soundcollection) impstation/imp-station-14#1747 (dolls & dwarf? plushie) impstation/imp-station-14#2277 (griffy plushie) ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> gift exchange with impstation/imp-station-14#2879 :) ## Technical details <!-- Summary of code changes for easier review. --> - 2 flavor profiles (whimsy and stardust) - 7 plushies, added to the prize counter - 2 loadout prototypes - 1 soundcollection i don't know why it was made like this ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->   ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 hivehum, atdoop, starlighthowls, widgetbeck - add: A few new plushies can be bought from the prize counter. --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com> (cherry picked from commit cde02d18fbf18d705dfb550d73b2e94a71bd7b14)
makyo
added a commit
to lagrange14/substations
that referenced
this pull request
Jul 11, 2025
Remove secret Fix up plushies, add to crate <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> ## About the PR <!-- What did you change? --> This PR ports several plushies from Impstation. I attempted to keep this as close to the Impstation implementation as possible, so only the ragdoll and sentimental doll were added as loadout options. partial ports of. christ alive. impstation/imp-station-14#86 (ursa minor plushie) impstation/imp-station-14#1580 (ursa massive plushie) impstation/imp-station-14#1641 (ronck soundcollection) impstation/imp-station-14#1747 (dolls & dwarf? plushie) impstation/imp-station-14#2277 (griffy plushie) ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> gift exchange with impstation/imp-station-14#2879 :) ## Technical details <!-- Summary of code changes for easier review. --> - 2 flavor profiles (whimsy and stardust) - 7 plushies, added to the prize counter - 2 loadout prototypes - 1 soundcollection i don't know why it was made like this ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->   ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 hivehum, atdoop, starlighthowls, widgetbeck - add: A few new plushies can be bought from the prize counter. --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com> (cherry picked from commit cde02d18fbf18d705dfb550d73b2e94a71bd7b14) Co-authored-by: hivehum <ketchupfaced@gmail.com>
Hederadaii
pushed a commit
to Hederadaii/HederasHaven
that referenced
this pull request
Jul 15, 2025
<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> ## About the PR <!-- What did you change? --> This PR ports several plushies from Impstation. I attempted to keep this as close to the Impstation implementation as possible, so only the ragdoll and sentimental doll were added as loadout options. partial ports of. christ alive. impstation/imp-station-14#86 (ursa minor plushie) impstation/imp-station-14#1580 (ursa massive plushie) impstation/imp-station-14#1641 (ronck soundcollection) impstation/imp-station-14#1747 (dolls & dwarf? plushie) impstation/imp-station-14#2277 (griffy plushie) ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> gift exchange with impstation/imp-station-14#2879 :) ## Technical details <!-- Summary of code changes for easier review. --> - 2 flavor profiles (whimsy and stardust) - 7 plushies, added to the prize counter - 2 loadout prototypes - 1 soundcollection i don't know why it was made like this ## Media <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->   ## Requirements <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 hivehum, atdoop, starlighthowls, widgetbeck - add: A few new plushies can be bought from the prize counter. --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>
teamstarcup-bot
pushed a commit
to teamstarcup-bot/starcup
that referenced
this pull request
Sep 15, 2025
Remove secret Fix up plushies, add to crate <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> <!-- What did you change? --> This PR ports several plushies from Impstation. I attempted to keep this as close to the Impstation implementation as possible, so only the ragdoll and sentimental doll were added as loadout options. partial ports of. christ alive. impstation/imp-station-14#86 (ursa minor plushie) impstation/imp-station-14#1580 (ursa massive plushie) impstation/imp-station-14#1641 (ronck soundcollection) impstation/imp-station-14#1747 (dolls & dwarf? plushie) impstation/imp-station-14#2277 (griffy plushie) <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> gift exchange with impstation/imp-station-14#2879 :) <!-- Summary of code changes for easier review. --> - 2 flavor profiles (whimsy and stardust) - 7 plushies, added to the prize counter - 2 loadout prototypes - 1 soundcollection i don't know why it was made like this <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->   <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 hivehum, atdoop, starlighthowls, widgetbeck - add: A few new plushies can be bought from the prize counter. --------- Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com> (cherry picked from commit cde02d18fbf18d705dfb550d73b2e94a71bd7b14) Co-authored-by: hivehum <ketchupfaced@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ghoulcallers funny joke vs my uncontrollable urge to meddle
the tl;dr of this is that rock got inhands and i also added a big rock that does stupid damage and it has an extremely low chance to spawn on salvage wrecks. it slows you by half and cant go in any bag or equipment slot so its fine that it does 25 damage per hit
no cl because this is admeme/easter egg